ostbuild: Drop use of link cache, it's gone now

diff --git a/src/ostbuild/pyostbuild/builtin_chroot_compile_one.py b/src/ostbuild/pyostbuild/builtin_chroot_compile_one.py
index 8513863268ae5b9dc1f25a830acf337dc9b33af0..318cdd391710b41036e3f8f4f9dbcb45ef6719d4 100755 (executable)
--- a/src/ostbuild/pyostbuild/builtin_chroot_compile_one.py
+++ b/src/ostbuild/pyostbuild/builtin_chroot_compile_one.py
@@ -71,9 +71,6 @@ class OstbuildChrootCompileOne(builtins.Builtin):
         for ref,rev in zip(refs_to_resolve, resolved_refs):
             ref_to_rev[ref] = rev
 
-        link_cache_dir = os.path.join(self.workdir, 'link-cache')
-        fileutil.ensure_dir(link_cache_dir)
-
         sha = hashlib.sha256()
 
         (fd, tmppath) = tempfile.mkstemp(suffix='.txt', prefix='ostbuild-buildroot-')
@@ -116,12 +113,9 @@ class OstbuildChrootCompileOne(builtins.Builtin):
             log("composing buildroot from %d parents (last: %r)" % (len(checkout_trees),
                                                                     checkout_trees[-1][0]))
 
-        link_cache_dir = os.path.join(self.workdir, 'link-cache')
-        fileutil.ensure_dir(link_cache_dir)
-
         run_sync(['ostree', '--repo=' + self.repo,
-                  'checkout', '--link-cache=' + link_cache_dir,
-                  '--user-mode', '--union', '--from-file=' + tmppath, rootdir_tmp])
+                  'checkout', '--user-mode', '--union',
+                  '--from-file=' + tmppath, rootdir_tmp])
 
         os.unlink(tmppath);
 

diff --git a/src/ostbuild/pyostbuild/builtin_compose.py b/src/ostbuild/pyostbuild/builtin_compose.py
index 52dbb8f811cc1a61f1255903b9ddbbbb33f395c1..dabb516bd2615ecf79a4d979d014896b0465cfa4 100755 (executable)
--- a/src/ostbuild/pyostbuild/builtin_compose.py
+++ b/src/ostbuild/pyostbuild/builtin_compose.py
@@ -68,12 +68,8 @@ class OstbuildCompose(builtins.Builtin):
             f.write('\0')
         f.close()
 
-        link_cache_dir = os.path.join(self.workdir, 'link-cache')
-        fileutil.ensure_dir(link_cache_dir)
-
         run_sync(['ostree', '--repo=' + self.repo,
-                  'checkout', '--link-cache=' + link_cache_dir,
-                  '--user-mode', '--no-triggers',
+                  'checkout', '--user-mode', '--no-triggers',
                   '--union', '--from-stdin', compose_rootdir],
                  stdin=open(tmppath))
         os.unlink(tmppath)